From 6b11c5af1eb93c685a1b9df00acb22969c26513e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 21 Oct 2016 15:16:39 +0100 Subject: [PATCH] Replace 4.6 with 4.8 in debian/* find debian -type f -print0 | xargs -0r perl -i~ -pe 's/\b4\.6\b/4.8/' And then commit everything except debian/changelog. Signed-off-by: Ian Jackson --- debian/control | 32 +++++++------- debian/rules.gen | 60 +++++++++++++------------- debian/xen-utils-4.6.lintian-overrides | 2 +- debian/xen-utils-4.6.postinst | 2 +- debian/xen-utils-4.6.prerm | 2 +- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/debian/control b/debian/control index 32177fc745..a4a1c53ab6 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Build-Depends: autotools-dev, debhelper (>> 9), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc [i386 amd64], gcc-multilib [i386 amd64], e2fslibs-dev, iasl [i386 amd64], seabios (>= 1.7.4-2~) [i386 amd64], libaio-dev, libfdt-dev [armhf arm64], libglib2.0-dev, liblzma-dev, libncurses5-dev, libpixman-1-dev, libyajl-dev, libssl-dev, pkg-config, uuid-dev, zlib1g-dev XS-Python-Version: current -Package: libxen-4.6 +Package: libxen-4.8 Architecture: amd64 arm64 armhf i386 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -26,7 +26,7 @@ Multi-Arch: same Package: libxen-dev Architecture: amd64 arm64 armhf i386 Section: libdevel -Depends: libxen-4.6 (= ${binary:Version}), libxenstore3.0 (= ${binary:Version}), ${misc:Depends} +Depends: libxen-4.8 (= ${binary:Version}), libxenstore3.0 (= ${binary:Version}), ${misc:Depends} Description: Public headers and libs for Xen This package contains the public headers and static libraries for Xen. . @@ -73,21 +73,21 @@ Description: Xen administrative tools - common files This package is only required on the host system (Domain 0) and not on the virtual guest systems (Domain U). -Package: xen-utils-4.6 +Package: xen-utils-4.8 Architecture: amd64 arm64 armhf i386 Provides: xen-utils Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version}) -Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-4.6, qemu-system-x86, grub-xen-host [i386 amd64] +Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-4.8, qemu-system-x86, grub-xen-host [i386 amd64] Description: XEN administrative tools The userspace tools to manage a system virtualized through the XEN virtual machine monitor. Built-Using: ${misc:Built-Using} -Package: xen-hypervisor-4.6-amd64 +Package: xen-hypervisor-4.8-amd64 Architecture: amd64 i386 -Provides: xen-hypervisor, xen-hypervisor-4.6, xen-hypervisor-amd64 +Provides: xen-hypervisor, xen-hypervisor-4.8, xen-hypervisor-amd64 Depends: ${misc:Depends} -Recommends: xen-utils-4.6 +Recommends: xen-utils-4.8 Description: Xen Hypervisor on AMD64 The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your @@ -100,16 +100,16 @@ Description: Xen Hypervisor on AMD64 Package: xen-system-amd64 Architecture: amd64 i386 Provides: xen-system -Depends: xen-hypervisor-4.6-amd64, xen-utils-4.6, ${misc:Depends} +Depends: xen-hypervisor-4.8-amd64, xen-utils-4.6, ${misc:Depends} Description: Xen System on AMD64 (meta-package) This package depends on the latest Xen hypervisor for use on AMD64 and the Xen utils. -Package: xen-hypervisor-4.6-arm64 +Package: xen-hypervisor-4.8-arm64 Architecture: arm64 -Provides: xen-hypervisor, xen-hypervisor-4.6, xen-hypervisor-arm64 +Provides: xen-hypervisor, xen-hypervisor-4.8, xen-hypervisor-arm64 Depends: ${misc:Depends} -Recommends: xen-utils-4.6 +Recommends: xen-utils-4.8 Description: Xen Hypervisor on ARM64 The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your @@ -122,16 +122,16 @@ Description: Xen Hypervisor on ARM64 Package: xen-system-arm64 Architecture: arm64 Provides: xen-system -Depends: xen-hypervisor-4.6-arm64, xen-utils-4.6, ${misc:Depends} +Depends: xen-hypervisor-4.8-arm64, xen-utils-4.6, ${misc:Depends} Description: Xen System on ARM64 (meta-package) This package depends on the latest Xen hypervisor for use on ARM64 and the Xen utils. -Package: xen-hypervisor-4.6-armhf +Package: xen-hypervisor-4.8-armhf Architecture: armhf -Provides: xen-hypervisor, xen-hypervisor-4.6, xen-hypervisor-armhf +Provides: xen-hypervisor, xen-hypervisor-4.8, xen-hypervisor-armhf Depends: ${misc:Depends} -Recommends: xen-utils-4.6 +Recommends: xen-utils-4.8 Description: Xen Hypervisor on ARMHF The hypervisor is the "core" for XEN itself. It gets booted by the boot loader and controls cpu and memory, sharing them between your @@ -144,7 +144,7 @@ Description: Xen Hypervisor on ARMHF Package: xen-system-armhf Architecture: armhf Provides: xen-system -Depends: xen-hypervisor-4.6-armhf, xen-utils-4.6, ${misc:Depends} +Depends: xen-hypervisor-4.8-armhf, xen-utils-4.6, ${misc:Depends} Description: Xen System on ARMHF (meta-package) This package depends on the latest Xen hypervisor for use on ARMHF and the Xen utils. diff --git a/debian/rules.gen b/debian/rules.gen index d528dac9d6..e6afd7f4fc 100644 --- a/debian/rules.gen +++ b/debian/rules.gen @@ -4,117 +4,117 @@ binary-arch_amd64: binary-arch_amd64_none binary-arch_amd64_real binary-arch_amd64_none: binary-arch_amd64_none_amd64 binary-arch_amd64_none_real binary-arch_amd64_none_amd64:: binary-arch_amd64_none_amd64_real binary-arch_amd64_none_amd64:: - $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.6' XEN_ARCH='x86_64' - $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-amd64' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.8' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-amd64' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.8' XEN_ARCH='x86_64' binary-arch_amd64_none_amd64_real: binary-arch_amd64_none_real: binary-arch_amd64_real:: - $(MAKE) -f debian/rules.real binary-arch-arch ARCH='amd64' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real binary-arch-arch ARCH='amd64' VERSION='4.8' XEN_ARCH='x86_64' binary-arch_arm64: binary-arch_arm64_none binary-arch_arm64_real binary-arch_arm64_none: binary-arch_arm64_none_arm64 binary-arch_arm64_none_real binary-arch_arm64_none_arm64:: binary-arch_arm64_none_arm64_real binary-arch_arm64_none_arm64:: - $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm64' - $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-arm64' ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-arm64' ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm64' binary-arch_arm64_none_arm64_real: binary-arch_arm64_none_real: binary-arch_arm64_real:: - $(MAKE) -f debian/rules.real binary-arch-arch ARCH='arm64' VERSION='4.6' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real binary-arch-arch ARCH='arm64' VERSION='4.8' XEN_ARCH='arm64' binary-arch_armhf: binary-arch_armhf_none binary-arch_armhf_real binary-arch_armhf_none: binary-arch_armhf_none_armhf binary-arch_armhf_none_real binary-arch_armhf_none_armhf:: binary-arch_armhf_none_armhf_real binary-arch_armhf_none_armhf:: - $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm32' - $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-armhf' ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-armhf' ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm32' binary-arch_armhf_none_armhf_real: binary-arch_armhf_none_real: binary-arch_armhf_real:: - $(MAKE) -f debian/rules.real binary-arch-arch ARCH='armhf' VERSION='4.6' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real binary-arch-arch ARCH='armhf' VERSION='4.8' XEN_ARCH='arm32' binary-arch_i386: binary-arch_i386_none binary-arch_i386_real binary-arch_i386_none: binary-arch_i386_none_amd64 binary-arch_i386_none_real binary-arch_i386_none_amd64:: binary-arch_i386_none_amd64_real binary-arch_i386_none_amd64:: - $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.6' XEN_ARCH='x86_64' - $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-amd64' ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real binary-arch-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.8' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-pxen-system-amd64' ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.8' XEN_ARCH='x86_64' binary-arch_i386_none_amd64_real: binary-arch_i386_none_real: binary-arch_i386_real:: - $(MAKE) -f debian/rules.real binary-arch-arch ARCH='i386' VERSION='4.6' XEN_ARCH='x86_32' + $(MAKE) -f debian/rules.real binary-arch-arch ARCH='i386' VERSION='4.8' XEN_ARCH='x86_32' binary-indep:: - $(MAKE) -f debian/rules.real binary-indep VERSION='4.6' + $(MAKE) -f debian/rules.real binary-indep VERSION='4.8' build-arch: build-arch_amd64 build-arch_arm64 build-arch_armhf build-arch_i386 build-arch_amd64: build-arch_amd64_none build-arch_amd64_real build-arch_amd64_none: build-arch_amd64_none_amd64 build-arch_amd64_none_real build-arch_amd64_none_amd64:: build-arch_amd64_none_amd64_real build-arch_amd64_none_amd64:: - $(MAKE) -f debian/rules.real build-arch-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real build-arch-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.8' XEN_ARCH='x86_64' build-arch_amd64_none_amd64_real: build-arch_amd64_none_real: build-arch_amd64_real:: - $(MAKE) -f debian/rules.real build-arch-arch ARCH='amd64' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real build-arch-arch ARCH='amd64' VERSION='4.8' XEN_ARCH='x86_64' build-arch_arm64: build-arch_arm64_none build-arch_arm64_real build-arch_arm64_none: build-arch_arm64_none_arm64 build-arch_arm64_none_real build-arch_arm64_none_arm64:: build-arch_arm64_none_arm64_real build-arch_arm64_none_arm64:: - $(MAKE) -f debian/rules.real build-arch-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real build-arch-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm64' build-arch_arm64_none_arm64_real: build-arch_arm64_none_real: build-arch_arm64_real:: - $(MAKE) -f debian/rules.real build-arch-arch ARCH='arm64' VERSION='4.6' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real build-arch-arch ARCH='arm64' VERSION='4.8' XEN_ARCH='arm64' build-arch_armhf: build-arch_armhf_none build-arch_armhf_real build-arch_armhf_none: build-arch_armhf_none_armhf build-arch_armhf_none_real build-arch_armhf_none_armhf:: build-arch_armhf_none_armhf_real build-arch_armhf_none_armhf:: - $(MAKE) -f debian/rules.real build-arch-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real build-arch-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm32' build-arch_armhf_none_armhf_real: build-arch_armhf_none_real: build-arch_armhf_real:: - $(MAKE) -f debian/rules.real build-arch-arch ARCH='armhf' VERSION='4.6' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real build-arch-arch ARCH='armhf' VERSION='4.8' XEN_ARCH='arm32' build-arch_i386: build-arch_i386_none build-arch_i386_real build-arch_i386_none: build-arch_i386_none_amd64 build-arch_i386_none_real build-arch_i386_none_amd64:: build-arch_i386_none_amd64_real build-arch_i386_none_amd64:: - $(MAKE) -f debian/rules.real build-arch-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real build-arch-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.8' XEN_ARCH='x86_64' build-arch_i386_none_amd64_real: build-arch_i386_none_real: build-arch_i386_real:: - $(MAKE) -f debian/rules.real build-arch-arch ARCH='i386' VERSION='4.6' XEN_ARCH='x86_32' + $(MAKE) -f debian/rules.real build-arch-arch ARCH='i386' VERSION='4.8' XEN_ARCH='x86_32' build-indep:: - $(MAKE) -f debian/rules.real build-indep VERSION='4.6' + $(MAKE) -f debian/rules.real build-indep VERSION='4.8' setup: setup_amd64 setup_arm64 setup_armhf setup_i386 setup_amd64: setup_amd64_none setup_amd64_real setup_amd64_none: setup_amd64_none_amd64 setup_amd64_none_real setup_amd64_none_amd64:: setup_amd64_none_amd64_real setup_amd64_none_amd64:: - $(MAKE) -f debian/rules.real setup-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real setup-flavour ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' IMAGE_SUFFIX='.gz' VERSION='4.8' XEN_ARCH='x86_64' setup_amd64_none_amd64_real: setup_amd64_none_real: setup_amd64_real:: - $(MAKE) -f debian/rules.real setup-arch ARCH='amd64' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real setup-arch ARCH='amd64' VERSION='4.8' XEN_ARCH='x86_64' setup_arm64: setup_arm64_none setup_arm64_real setup_arm64_none: setup_arm64_none_arm64 setup_arm64_none_real setup_arm64_none_arm64:: setup_arm64_none_arm64_real setup_arm64_none_arm64:: - $(MAKE) -f debian/rules.real setup-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real setup-flavour ARCH='arm64' FEATURESET='none' FLAVOUR='arm64' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm64' setup_arm64_none_arm64_real: setup_arm64_none_real: setup_arm64_real:: - $(MAKE) -f debian/rules.real setup-arch ARCH='arm64' VERSION='4.6' XEN_ARCH='arm64' + $(MAKE) -f debian/rules.real setup-arch ARCH='arm64' VERSION='4.8' XEN_ARCH='arm64' setup_armhf: setup_armhf_none setup_armhf_real setup_armhf_none: setup_armhf_none_armhf setup_armhf_none_real setup_armhf_none_armhf:: setup_armhf_none_armhf_real setup_armhf_none_armhf:: - $(MAKE) -f debian/rules.real setup-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.6' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real setup-flavour ARCH='armhf' FEATURESET='none' FLAVOUR='armhf' IMAGE_SUFFIX='' VERSION='4.8' XEN_ARCH='arm32' setup_armhf_none_armhf_real: setup_armhf_none_real: setup_armhf_real:: - $(MAKE) -f debian/rules.real setup-arch ARCH='armhf' VERSION='4.6' XEN_ARCH='arm32' + $(MAKE) -f debian/rules.real setup-arch ARCH='armhf' VERSION='4.8' XEN_ARCH='arm32' setup_i386: setup_i386_none setup_i386_real setup_i386_none: setup_i386_none_amd64 setup_i386_none_real setup_i386_none_amd64:: setup_i386_none_amd64_real setup_i386_none_amd64:: - $(MAKE) -f debian/rules.real setup-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.6' XEN_ARCH='x86_64' + $(MAKE) -f debian/rules.real setup-flavour ARCH='i386' FEATURESET='none' FLAVOUR='amd64' VERSION='4.8' XEN_ARCH='x86_64' setup_i386_none_amd64_real: setup_i386_none_real: setup_i386_real:: - $(MAKE) -f debian/rules.real setup-arch ARCH='i386' VERSION='4.6' XEN_ARCH='x86_32' + $(MAKE) -f debian/rules.real setup-arch ARCH='i386' VERSION='4.8' XEN_ARCH='x86_32' diff --git a/debian/xen-utils-4.6.lintian-overrides b/debian/xen-utils-4.6.lintian-overrides index f0db0958af..d4a6caff65 100644 --- a/debian/xen-utils-4.6.lintian-overrides +++ b/debian/xen-utils-4.6.lintian-overrides @@ -1 +1 @@ -statically-linked-binary usr/lib/xen-4.6/boot/hvmloader +statically-linked-binary usr/lib/xen-4.8/boot/hvmloader diff --git a/debian/xen-utils-4.6.postinst b/debian/xen-utils-4.6.postinst index 6103f943e4..2a4049b32f 100644 --- a/debian/xen-utils-4.6.postinst +++ b/debian/xen-utils-4.6.postinst @@ -4,7 +4,7 @@ set -e case "$1" in configure) - update-alternatives --remove xen-default /usr/lib/xen-4.6 + update-alternatives --remove xen-default /usr/lib/xen-4.8 if [ -x "/etc/init.d/xen" ]; then invoke-rc.d xen start || exit $? fi diff --git a/debian/xen-utils-4.6.prerm b/debian/xen-utils-4.6.prerm index 1dc5e54dbd..e467e77fab 100644 --- a/debian/xen-utils-4.6.prerm +++ b/debian/xen-utils-4.6.prerm @@ -4,7 +4,7 @@ set -e case "$1" in remove|upgrade) - update-alternatives --remove xen-default /usr/lib/xen-4.6 + update-alternatives --remove xen-default /usr/lib/xen-4.8 if [ -x "/etc/init.d/xen" ]; then invoke-rc.d xen stop || exit $? fi -- 2.30.2